From: Eli Zaretskii Date: Sat, 18 Jun 2011 14:33:14 +0000 (+0300) Subject: Fix a gratuitous crash in emacs -nw with iso-safe terminal encoding. X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2638^2~25 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5bb6dd9625bce67b40f3b75d4ab55e3abe567faf;p=emacs.git Fix a gratuitous crash in emacs -nw with iso-safe terminal encoding. src/term.c (produce_glyphs): Add IT_GLYPHLESS to the values of it->what accepted by the xassert. Fixes a gratuitous crash in an Emacs built with -DXASSERTS. --- diff --git a/src/ChangeLog b/src/ChangeLog index 42da109fc92..c08c5b87c3d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-06-18 Eli Zaretskii + * term.c (produce_glyphs): Add IT_GLYPHLESS to the values of + it->what accepted by the xassert. Fixes a gratuitous crash in an + Emacs built with -DXASSERTS. + * .gdbinit (xvectype, xvector, xcompiled, xchartable, xboolvector) (xpr, xfont, xbacktrace): Use "header.size" when accessing vectors and vector-like objects. diff --git a/src/term.c b/src/term.c index c68228cc51a..ab0bc1a4277 100644 --- a/src/term.c +++ b/src/term.c @@ -1546,6 +1546,7 @@ produce_glyphs (struct it *it) /* Nothing but characters are supported on terminal frames. */ xassert (it->what == IT_CHARACTER || it->what == IT_COMPOSITION + || it->what == IT_GLYPHLESS || it->what == IT_STRETCH); if (it->what == IT_STRETCH)